From: Kenichi Handa <handa@m17n.org>
Date: Thu, 26 Aug 2010 00:28:08 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~4259
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=41a5c5c417bf605499fdfa16d96cd93fa4fca6a5;p=emacs.git

merge trunk
---

41a5c5c417bf605499fdfa16d96cd93fa4fca6a5